Use install state in workload manifest provider #33643
Merged
+1,210
−308
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dotnet-issue-labeler
bot
added
Area-Workloads
untriaged
dsplaisted
requested review from
joeloff,
MiYanni,
nagilson,
Forgind and
JL03-Yue
joeloff
reviewed
Jun 28, 2023
src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadInstallType.cs
Outdated
Show resolved
Hide resolved
|
Any chance you could isolate the changes that were just moving things from one class to another from the changes that had substantive code impact? The line count is high, but a lot of the early parts especially were just moving code 🙂 |
dsplaisted
force-pushed
the
workload-global-pinning
branch
from
8d2ce53
to
f92d077
Compare
@Forgind I've rebased the code moves into separate commits. |
Forgind
approved these changes
Jun 29, 2023
...ft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.InstallStateReader.cs
Show resolved
Hide resolved
src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs
Show resolved
Hide resolved
src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs
Show resolved
Hide resolved
joeloff
reviewed
Jun 30, 2023
src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf
Show resolved
Hide resolved
joeloff
approved these changes
Jun 30, 2023
Forgind
approved these changes
Jun 30, 2023
…ld prevent workload install state from being used
This reverts commit 8ce7dca.
dsplaisted
force-pushed
the
workload-global-pinning
branch
from
bfee8d8
to
98221a3
Compare
|
@jaredpar This commit seems to have caused the Full Framework CI leg to time out. Is returning a |
dsplaisted
added
Servicing-consider
and removed
untriaged
16 tasks
This was referenced Jul 9, 2023
…WorkloadResolver.GetInstalledManifests
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains a bug fix and a feature.
Bug Fix
Description
Fixes issue where when reading side-by-side workload manifests, the Manifest ID would be reported incorrectly.
Customer Impact
If this change doesn't go into 7.0.4xx / VS 17.7, then VS 17.7 and its version of MSBuild will not work properly with future builds of the .NET 8 SDK (once we switch to side-by-side workload manifests). The behavior will either be that the resolver will crash, preventing builds from succeeding, or that it won't successfully load any workloads.
Regression?
Risk
Verification
Feature
Description
Implements last part of resolver logic for dotnet/designs#294, which is to honor workload install state. This will support commands which install a different workload set version, for example
dotnet workload update --version 8.0.101.Customer Impact
If this change doesn't go into 7.0.4xx / VS 17.7, then in some cases where a command is run that selects a specific workload set version, that would not be honored by Visual Studio 17.7 and its version of MSBuild.
A workaround would be to specify the desired workload set version in a global.json file.
Regression?
Risk
Verification